Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more tests and merge in some other PR's #70

Merged
merged 13 commits into from
Nov 7, 2024

Conversation

ekluzek
Copy link
Contributor

@ekluzek ekluzek commented Aug 2, 2023

Add in more tests, and merge in some of the other PR's

Adds more tests, especially on izumi.

Resolves #68
Resolves #79
Resolves #61
Resolves #91
Resolves #103
Resolves #104
Resolves #107

@ekluzek ekluzek self-assigned this Aug 2, 2023
Copy link
Contributor

@jedwards4b jedwards4b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that this PR needs an update for derecho if you still want to merge it.

cism runoff will be now routed to ocn via mosart

Enables CISM runoff to be routed to the ocean via mosart.

All runoff from CISM will be routed directly to the outlet points
New fields will be advertised in the mosart cap
call fldlist_add(fldsFrRof_num, fldsFrRof, 'Forr_rofl_glc')
call fldlist_add(fldsFrRof_num, fldsFrRof, 'Forr_rofi_glc')

 Conflicts:
	cime_config/testdefs/testlist_mosart.xml
Adds more tests on izumi as well as some gnu and one nvhpc test.
it isn't functional yet. Would be good
for testing though.

This resolves ESCOMP#61
@ekluzek
Copy link
Contributor Author

ekluzek commented Oct 31, 2024

@slevis-lmwg I did some work on this. And I'm viewing it as at a place for you to complete the tag for. Let me know if there's anything we need to go over. Adding more testing before we go ahead and make several tags seems like the best ordering of things.

I also went through the MOSART issues and flagged a couple as things we perhaps should work on. As well as marking a bunch as lower priority that we don't need to worry about right now.

@slevis-lmwg
Copy link
Contributor

Submitting the mosart test-suites next.

@slevis-lmwg
Copy link
Contributor

slevis-lmwg commented Oct 31, 2024

Sorry, I have to partly back out 891a45d because now i'm getting ERROR: Invalid compset name, I2000Clm60BgcCru

@ekluzek
Copy link
Contributor Author

ekluzek commented Oct 31, 2024

Thinking about this I think we probably should use mostly the same compsets for these MOSART tests. Answers will be different for Sp vs. BgcCru cases -- but in terms of MOSART do we need to test with both SP and BGC? And with different forcing? We should exercise all the MOSART options -- but maybe use the same general compset for all. The differences that do matter are 1850 vs 2000 vs HIST as well as when CISM is used.

Part of the philosophy of spanning many compsets is to show that MOSART continues to work under standard things that change answers. But, I don't think we've seen tests show problems under different compsets that primarily change CLM answers. So I think we should maybe drop this and simplify the testing compsets.

@slevis-lmwg should we maybe have a quick meeting about this?

@slevis-lmwg
Copy link
Contributor

On izumi this fails, including with vanilla mosart
./run_sys_tests -s mosart -c mosart1.1.02-ctsm5.2.029 -g mosart1.1.03-ctsm5.3.009

Traceback (most recent call last):
  File "./run_sys_tests", line 20, in <module>
    main(cime_path=cime_path)
  File "/fs/cgd/data0/slevis/git/sep_inst_flds_iss1059/python/ctsm/run_sys_tests.py", line 93, in main
    extra_create_test_args=args.extra_create_test_args,
  File "/fs/cgd/data0/slevis/git/sep_inst_flds_iss1059/python/ctsm/run_sys_tests.py", line 235, in run_sys_tests
    running_ctsm_py_tests=running_ctsm_py_tests,
  File "/fs/cgd/data0/slevis/git/sep_inst_flds_iss1059/python/ctsm/run_sys_tests.py", line 689, in _run_test_suite
    suite_compilers = _get_compilers_for_suite(suite_name, machine.name, running_ctsm_py_tests)
  File "/fs/cgd/data0/slevis/git/sep_inst_flds_iss1059/python/ctsm/run_sys_tests.py", line 778, in _get_compilers_for_suite
    test_data = get_tests_from_xml(xml_machine=machine_name, xml_category=suite_name)
  File "/fs/cgd/data0/slevis/git/sep_inst_flds_iss1059/cime/CIME/test_utils.py", line 43, in get_tests_from_xml
    for comp in comps:
TypeError: 'NoneType' object is not iterable

@ekluzek @jedwards4b let me know if we can live without testing on izumi or if we need this fixed before I proceed.

@ekluzek
Copy link
Contributor Author

ekluzek commented Oct 31, 2024

@slevis-lmwg we should figure out what is up with testing on Izumi, and get it resolved and working. This problem isn't something specific for MOSART it must be something about the CTSM version being used here...

@jedwards4b don't worry about this -- we'll figure it out...

@slevis-lmwg
Copy link
Contributor

@mvdebolskiy @mvertens
From meeting with @ekluzek
we are updating the mosart testlist. See one of the next commits that I will push soon.

@ekluzek
Copy link
Contributor Author

ekluzek commented Oct 31, 2024

@jedwards4b can you approve this now? It looks like it's held up until you approve it. We could dismiss your review -- because it was addressed. But, better for you to just click approve.

Thanks.

@slevis-lmwg
Copy link
Contributor

slevis-lmwg commented Oct 31, 2024

Generating baselines:
./run_sys_tests -s mosart -c mosart1.1.02-ctsm5.2.029 -g mosart1.1.02-ctsm5.3.009
OK izumi
OK derecho

Comparing to baselines:
./run_sys_tests -s mosart -g mosart1.1.03-ctsm5.3.009 -c mosart1.1.02-ctsm5.3.009
OK izumi
IN PROG derecho: /glade/work/slevis/git/hXi_hXa_tapes_iss1059/tests_1106-135317de

@mvdebolskiy
Copy link
Contributor

@slevis-lmwg @mvertens
The testlist looks ok to me for now, If we need to adjust it for our machines, you'll just get a PR here from NorESMhub fork.

@slevis-lmwg
Copy link
Contributor

slevis-lmwg commented Nov 6, 2024

  • When mosart test suite completes, I will make the tag and merge

@slevis-lmwg slevis-lmwg merged commit 41fbf9e into ESCOMP:master Nov 7, 2024
@slevis-lmwg
Copy link
Contributor

New tag
mosart1.1.03

slevis-lmwg added a commit to slevis-lmwg/MOSART that referenced this pull request Nov 8, 2024
PR ESCOMP#70 add more tests especially on izumi and merge other PRs

Resolves ESCOMP#68
Resolves ESCOMP#79
Resolves ESCOMP#61
Resolves ESCOMP#91
Resolves ESCOMP#103
Resolves ESCOMP#104
Resolves ESCOMP#107
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment